bitkeeper revision 1.656 (3fe4de1f1IOfUVzwLIqE8EHIf7xJoA)

Merge nidd.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into nidd.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

diff --cc .rootkeys
Simple merge

diff --cc xen/Makefile
index 0e823baa507fde5ddee1641ca87600ecfd94e060,bf394f721b0710e861d8907b9fc5b635cd36dbb5..17f14b89f10683ddbb43dbf2ad4aac69d99225f5
--- 1/xen/Makefile
--- 2/xen/Makefile
+++ b/xen/Makefile
@@@ -2,8 -2,8 +2,8 @@@
  # This is the correct place to edit the build version.
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 1
- export XEN_SUBVERSION    = 2
+ export XEN_SUBVERSION    = 3
 -export XEN_EXTRAVERSION  = "-devel"
 +export XEN_EXTRAVERSION  = "-rc"
  
  export BASEDIR          := $(shell pwd)